3cfa6fcda641bd02e623bc577d8aec0c7f827b0c,src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java,MergeVisitor,visit,#Way#,90
Before Change
*/
public void visit(Way other) {
fixWay(other);
if (mergeAfterId(ds.ways, wayshash, other))
return;
Way my = null;
for (Way w : ds.ways) {
if (match(other, w) && ((mergeds == null) || (!mergeds.ways.contains(w)))) {
my = w;
break;
}
}
if (my == null) {
ds.ways.add(other);
} else {
merged.put(other, my);
mergeCommon(my, other);
if (my.modified && !other.modified)
return;
boolean same = true;
Iterator<Node> it = other.nodes.iterator();
for (Node n : my.nodes) {
if (!match(n, it.next()))
same = false;
}
if (!same) {
my.modified = other.modified;
}
}
}
After Change
public void visit(Way other) {
fixWay(other);
genMerge(other, ds.ways, mergeds.ways, wayshash);
}
public void visit(Relation other) {